Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Filebeat] Add access_key_id, secret_access_key and session_token into aws module config #17456

Merged
merged 6 commits into from
Apr 3, 2020
Merged

[Filebeat] Add access_key_id, secret_access_key and session_token into aws module config #17456

merged 6 commits into from
Apr 3, 2020

Conversation

kaiyan-sheng
Copy link
Contributor

@kaiyan-sheng kaiyan-sheng commented Apr 2, 2020 •
edited
Loading

What does this PR do?

This PR is to add missing configuration parameters into filesets under aws module.

Why is it important?

With this PR, users will be able to use access_key_id, secret_access_key and session_token directly in Filebeat aws module.

This PR also adds the missing config for ec2 fileset into default aws.yml.disabled config with enabled: false.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

@kaiyan-sheng kaiyan-sheng self-assigned this Apr 2, 2020
@kaiyan-sheng kaiyan-sheng added Filebeat Filebeat needs_backport PR is waiting to be backported to other branches. Team:Platforms Label for the Integrations - Platforms team labels Apr 2, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations-platforms (Team:Platforms)

@leehinman
Copy link
Contributor

This is great and offers a lot of flexibility for our users.

I'm wondering if we should add an authentication section to the docs to explain what happens when the various auth variables are set and what combo to use them in? The s3 input docs already has the "aws-credentials-config" section. Could we maybe link to that?

@kaiyan-sheng
Copy link
Contributor Author

@leehinman Good point! I will add the link. Thank you!

leehinman
leehinman approved these changes Apr 3, 2020
View reviewed changes
Copy link
Contributor

@leehinman leehinman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kaiyan-sheng kaiyan-sheng merged commit cab88e1 into elastic:master Apr 3, 2020
@kaiyan-sheng kaiyan-sheng deleted the aws_creds_fb branch April 3, 2020 17:53
@kaiyan-sheng kaiyan-sheng mentioned this pull request Apr 3, 2020
Merged
6 tasks
@kaiyan-sheng kaiyan-sheng added v7.8.0 and removed needs_backport PR is waiting to be backported to other branches. labels Apr 3, 2020
@kaiyan-sheng kaiyan-sheng mentioned this pull request Apr 3, 2020
Merged
6 tasks
kaiyan-sheng added a commit that referenced this pull request Apr 5, 2020
@kaiyan-sheng
[Filebeat] Add access_key_id, secret_access_key and session_token int…
481856a 
…o aws module config (#17456) (#17483)

* Add access_key_id, secret_access_key and session_token into aws module config
(cherry picked from commit cab88e1)
kaiyan-sheng added a commit that referenced this pull request Apr 6, 2020
@kaiyan-sheng
Cherry-pick #17456 to 7.7: [Filebeat] Add access_key_id, secret_acces…
94b9228 
…s_key and session_token into aws module config (#17484)

* [Filebeat] Add access_key_id, secret_access_key and session_token into aws module config (#17456)
(cherry picked from commit cab88e1)
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@kaiyan-sheng
Cherry-pick elastic#17456 to 7.7: [Filebeat] Add access_key_id, secre…
39b2054 
…t_access_key and session_token into aws module config (elastic#17484)

* [Filebeat] Add access_key_id, secret_access_key and session_token into aws module config (elastic#17456)
(cherry picked from commit 64aeb2d)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@leehinman leehinman leehinman approved these changes

Assignees

@kaiyan-sheng kaiyan-sheng

Labels
Filebeat Filebeat review Team:Platforms Label for the Integrations - Platforms team v7.7.0 v7.8.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kaiyan-sheng @elasticmachine @leehinman @andresrc